-
Notifications
You must be signed in to change notification settings - Fork 313
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge b4bdev 20240404 #2455
Merged
Merged
Merge b4bdev 20240404 #2455
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…streams (dmleung 12 Mar 2023)
…st emission (dmleung 20 Mar 2023)
…he global tuning factor. We will keep the global tuning factor in CAM. dmleung 5 Apr 2023
Rework handling of evaporation constraint in SoilFluxes Occasionally, h2osoi_ice was going significantly negative in UpdateState_TopLayerFluxes - see ESCOMP#1979. As noted in that issue, this seems to be due to h2osoi_ice having a very different magnitude from h2osoi_liq, leading to greater-than-roundoff-level differences from zero final state in a relative sense (i.e., relative to the magnitude of h2osoi_ice) - I think because of the appearance of the sum (h2osoi_ice + h2osoi_liq) in the equations that limit fluxes. To try to deal with this, I have reworked the handling of the evaporation constraint to directly limit both the liqevap and solidevap, so that both of them should result in the equivalent liq or ice states going to 0 within roundoff. To do that, I needed to move the partitioning of the total flux into liquid and solid to earlier in the subroutine and then recalculate those partitioning fluxes in conditions where we're applying an evaporation constraint. Note that I applied a max of 0 to the new fluxes because many initial conditions files have roundoff-level negative H2OSOI_LIQ, so without this limit, we were getting roundoff-level negative fluxes. Resolves ESCOMP#1979
… gets to the soil eroditability file
…s and add tests for it that currently fail
…ure lnd_tuning_mode has all of the clm physics options paired with all of the forcing types, build-namelist tests now pass
BFB merge tag dev166 2315 @TeaganKing Refactoring run_neon for PLUMBER2 part1 2326 @samsrabin run_sys_tests: Check Python environment for FatesColdTwoStream tests 2213 @samsrabin Automatically assign high priority items to project 25 2330 @samsrabin Add Izumi version of the aux_clm unit testing Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml bld/namelist_files/namelist_definition_ctsm.xml bld/unit_testers/build-namelist_test.pl cime_config/config_component.xml
…for the Zender scheme how the soil eroditability file is handled
…modes for CAM4 and CAM5
…gic for it, this compilers, but does NOT run
…1_Mmpi-serial.1x1_brazil.I2000Clm51SpRs.derecho_gnu.clm-clm51cam6LndTuningMode PASSes
…M4, CAM5, CAM6 cases
… a version for each lnd_tuning_mode, and for CAM4 cases for the f09 grid
…ase for simplicity, suggested by @slevis-lmwg
Merge b4bdev 20240321
Merge tag 'ctsm5.1.dev175' into b4bdev
…t_interp, this gets the ERI_D.ne30pg3_t232.I1850Clm51BgcCrop.derecho_intel.clm-clm51cam6LndTuningMode test giving identical answers as baseline
…e is a izumi_nag test
Move the dust emission source function soil erodibility for the Zender scheme from CAM to CTSM
change needed for the addition of a dglc component in cdeps
ekluzek
approved these changes
Apr 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
change needed for the addition of a dglc component in cdeps #2449
Move the dust emission source function soil erodibility for the Zender scheme from CAM to CTSM #1967
Specific notes
Contributors other than yourself, if any: Various
CTSM Issues Fixed (include github issue #):
Closes #2222 - Fixing Negative Ice Fluxes from Ocean to Glacier
Closes #2117 - Add LND_TUNING_MODE for CAM4, CAM5, CAM7
Addresses #2149 - Change handling of LND_TUNING_MODE so user is warned of which option is used, add more supported options
Addresses part of #1836 - Move the soil erodibility dataset dust emission source function from CAM to CTSM
Helps with ESCOMP/CAM#651 - Move the dust emission source function and global tuning factor from CAM to CTSM
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)? Yes, namelist options for dust added
Testing performed, if any:
build-namelist tests (if CLMBuildNamelist.pm has changed):
regular tests